From: Miles Bader <miles@gnu.org>
Date: Tue, 3 Feb 2004 21:45:10 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24280
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b275e0643a6307aa6f88ab64a5dda2cf71de67ff;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index ef9bb5fc08c..e23788785ba 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,4 +1,3 @@
-
 ;;; x-dnd.el --- drag and drop support for X.
 
 ;; Copyright (C) 2004
@@ -601,5 +600,4 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
 (provide 'x-dnd)
 
-;;; arch-tag: ???
 ;;; x-dnd.el ends here